luci-base: ui.js: gracefully handle failing confirm calls on rollback
authorJo-Philipp Wich <[email protected]>
Thu, 5 May 2022 21:31:21 +0000 (23:31 +0200)
committerJo-Philipp Wich <[email protected]>
Fri, 20 May 2022 18:24:27 +0000 (20:24 +0200)
Do not abort the poll loop if some confirm request attempts fail, which
might happen when the device starts rolling back its configuration.

Before that fix, the rollback information dialog offering an unchecked
apply was not reliably presented in such situations.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit b6797821b86678d8dd604ce4805691784e6dc3ce)

modules/luci-base/htdocs/luci-static/resources/ui.js

index 5abd3b388d157c880d0fcef9b5347c7730cbf5cb..e5b5270c828c0cc09d7a04e7696b11eb540d865b 100644 (file)
@@ -4491,7 +4491,7 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
                                                        method: 'post',
                                                        timeout: L.env.apply_timeout * 1000,
                                                        query: { sid: L.env.sessionid, token: L.env.token }
-                                               }).then(call);
+                                               }).then(call, call.bind(null, { status: 0 }, null, 0));
                                        }, delay);
                                };